cleanup some namespacing conventions