Fix bug that causes crashes with an AppDomain host method
Switch naming scheme