Fix some naming derps