Move scopeName and name to the top