Refactored Names for better usage in other applications