Remove ucfirst, it has been deprecated > 1 year