Removed stupid iso naming scheme