Tidied up naming conventions for images.