renaming and fixing some methods