fixed code naming conventions