Small changes

Changed some Strings to have more accurate names.