Changed out name for consistency and clean up purpose