add namespace, remove underscores from class names