Corrects code to work with composed names