Fixed name and added aliases