rename/delete
Restore for correct capitalisation
repeat rename for tests
and restored for tests