The Gibny/Gibney family of Oldcastle

I am lost in  my Gibney ancestors.  Margaret Gibney was born in August of 1859. " Margaret Daughter of BRYAN Gibny and Anne Fitzgerald. SS Pat and Mary Fitzgerald"  is what the  10 August 1859 baptismal record says. 

According to what my family says she was the daughter of Richard Gibny and Anne Fitzgerald.  She was the third child of Richard and Anne:  Mary (1855),  Anne (1857), Margaret (above),  Patrick 1862, Elizabeth (Sister Editha) (1864).  Bridget (1867), Catherine ((1870), Richard (1871), Bernard (1874).

I went online to the NLI records to verify these people and found that 

• Mary = Parents were Richard Gibny and Ann Fitzgerald;  Witnesses were John Fitzgerald and Ann Gibney (married McEnroe ?)
• Anne = Parents were Richard Gibny and Ann Fitzgerald.  Witnesses were Bryan Gibny and Margaret Fitzgerald
• Margaret =  Daughter of BRYAN Gibny and Anne Fitzgerald. SS Pat and Mary Fitzgerald
• Patrick = Parents shown as Richard Gibny and Ann Fitzgerald.  Witnesses were James McCabe and Rose Curran (perhaps Gurran?) ( Married Caffry?) 
• Elizabeth = Richard Gibney and Ann Fitzgerald, parents.   Sponsors Cnristopher Roe and Margaret Fitzgerald
• Bridget =  Parents Richard Gibny and Anne Fitzgerald. SS Pat and Margaret Fitzgerald  (married Fox)
• Catherine =  Daughter of Richard Gibny and Anne Fitzgerald SS Thomas Coyle and Marcella Fitzgerald
• Richard =  Son of Richard Gibny and Anne Fitzgerald. SS Thomas and Catherine Fitzgerald (married Connell?)
• Bernard =  Parents were Richard Gibny and Ann Grall;  sponsors were Daniel Grall and Anne Gibney

So you can see my confusion.  I know that Margaret Gibney named her children according to the old naming pattern and her second son's name was Richard.  

I think that Richard Gibney, the father not the brother, was the son of Bryan Gibny and Anne Smyth.  Was there a mistake? Any thoughts would be great to move my thinking along.

ANd last, is the surname Fitzgerald  akin to Grall? 

Thanks for your thoughts.