Some fine tuning, renaming