Rename new module temporarily to resolve conflicts

Change-Id: I793465ff41746f5d520160977bf205eddb06e2a8