Initial commit of hasty namespace addition for class names