- Fix name calculation if naming scheme is given