adjusting namespace to conform with naming conventions