Some naming imporvements