Rename and another cleanups