A re-name needed ?