handle Moved Java elements, and fix bug with Renamed aliased Java types
#610