SOL-20 Minor naming changes