Removed hard-coded name