Remove function name collisions and fix journal closing