Name convention fix