Changed names and corrected some stuff