Renamed HandlerRegistration to Registration

Change-Id: I8bf0178daf893276b01c513140db34b0acf38d2a