Change method names to  more fitting ones