Folders has homogeneous naming

Change-Id: Id36630fc8cf6b22a73ef4adaa55acc9b8b59e687