Revert "update naming convention"

This reverts commit b7d45eef4f8f38fc349bc5d2ffb85eeaa59775e5.