Remove anchor replace with stage setup

Change-Id: I096753cacc423619262acdc49819706c54dcf1af
Standerdise class names for repo and package

Change-Id: I06a59dc87fafec43f2f4cc219ee8e1bdf0a35786