Reverted uppercase changes to prefix names and returning lowercase name