fixed namespaces and prelude