Fixed property name conflict