Rename to modern name
Re-factoring
Update document