fix naming conventions