Fixed pretty bad naming that broke stuff