modified Names according to coding standard.