Fixed naming (upper/lowercase), removed !!, etc.