More renaming an small tweaks