Reverted to MAEC Namespace - related to Issue #19