Change resource name and remove unneeded if from 44232af