renamed Registration classes after removal of old code