Changed names with more appropriate.