Applied new naming scheme
Updated Readme due to applied naming scheme