Fixing name error. We should have the type system catch these... :-/
cleanups