fixing naming conventions