Fixed name and more