Doc and local variables renamed