modification related to naming and method change