Remove hardcoded names