Changed hardcoded names