Fixed errors in naming conventions