Reverting to hardcoded names