Some fixes related to names