removed underscores and upper cased the first letter of the friendly name and singular name