Converted some resource identifiers I missed