Redid naming structure

Change-Id: I6372613779fe430eb2959532f2ae5569b612d7f4