Fixed naming and ejb classes delete  bugs