am f4911e43: Rename resources with new scheme (DO NOT MERGE)

* commit 'f4911e43481eb4270f58c879d435754b5af64f06':
  Rename resources with new scheme (DO NOT MERGE)