Fixed naming-issues (name for one resource/more or less resources)