Refactor: Verbose names make me happy