Changed some string names for better clarity