Change the naming system

Change-Id: I159c4e0b4bb581f62549ab089aea24cd72f3a45c