Changed names to standar names