Adding rename alias and some cleanup