Removed focus naming

Updated viewable strings to remove focus naming convention.