Some renaming to match the default rules of classnames