Adjusted naming