Removed class Name and replaced its use with Strings.