[rename] cleaning up naming conventions for schema