Names updated, exported to PNG

More organised and easier to load