Attempt to fix name alignment