Incorporated latest naming conventions changing to observable api