Some more renaming to resourceSubType