Updated string names to make them more reusable.