Fix the dep and default name mapping