Updated to be consistent with SEDA naming convention