Fixes after debugging the new resource naming schema