better configuration, including regex-based short-name configuration