Added back umagellan prefix to some places to fix the error (again).