Changed naming to something more sensible