Add changes from Arron McDaid to preserve names.