am 95cf152a: (-s ours) am f4911e43: Rename resources with new scheme (DO NOT MERGE)

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