Remove hardcoded name