Rename application, fix some sorting