Name convention updated