Fixed naming issue. todo: need to clean up naming stuff from previous implementation