Rename several public interfaces and more work on refactoring textures.