Added new naming conventions.