A couple mistakes on naming