Rename Classes, add message class