More consistent naming
Changed everything.