big change of naming to common one