Disposition refactoring and naming changes