Major cleanup

Also corrected the name to match the package

Change-Id: I3d1fc6aa1e11961226b58ab1963f13598dd3f3b0