Change method names for uniformity