Rename and update with misc stuff