Make the naming consistent
Update the author name
Fix typos