Refactored names of strings. Made them final.