Refactored names removing "-" and replacing with "_"