Revert "Update layout's name to Andrei only."

This reverts commit 0ff38118f2813753f9ca55e0cd1ea6ec56b158ee.