Naming convention + getter syntax fix