Name change and minor fix