Fixed bug in naming conventions.