Change names to do grep more easily