Formatted and corrected naming conventions as per Kraetschmar Guidelines