naming: change baseuri to base_uri