Refactored some names in Common project