Address inconsistent type vs location_type usage

Opening for build, please ignore for now.
F811 redefinition of unused 'models' from line 5