fix typo and short basenames