refactored naming conventions in test projects