Fixed Issues related to Conventions and Function Names.