update according new naming conventions