Adjusted some names to follow design guidelines and to be more descriptive