base_dir related functions renamed