Updated to proper naming system for 1.7