Add robustness in naming convention