More consistent class property naming
Small typo + extended Foreign Key business