various name changes to be more compliant to coding conventions