Merge "rename var to provide common style in services"