Cleanup id's and naming convention

More descriptive.