#18 Fix namespace errors on forms