Renaming to use hypen and code cleanup