Removed underscores from name