Drop hard-coded name