Remove stages, standerdise on class names

Change-Id: Ia6c74c3e7ba1da8e862652e087dfe6f6b501c46d