Some renaming and few internal improvements