Rename public api methods
Support conditionals