Rename function, address comments