fixes added for naming conventions