Naming convention fixed (all to camelCase)