Fix everything and support a combined prefix and name length more than 16 characters