Some new methods and some renaming