Changed cpp and h names