Adjusted naming structure