Name package updated to be more compliant with good practices ;)