[v7r0] Fixes after debugging the new resource naming schema