rename references
merge to master